Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)

committer Andrea Corallo <akrl@sdf.org>

Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)
author Andrea Corallo <akrl@sdf.org>
Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)
committer Andrea Corallo <akrl@sdf.org>
Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/help.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/print.c
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)
committer	Andrea Corallo <akrl@sdf.org>
	Sat, 7 Nov 2020 15:21:36 +0000 (16:21 +0100)
		1	2
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/help.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/print.c	patch \|	diff1 \|	diff2 \|	blob \| history